Revision: baz--resolve--1.2--patch-13
Archive: jblack@gnuarch.org--2004
Creator: James Blackwell <jblack@canonical.com>
Date: Wed Feb  2 00:55:39 EST 2005
Standard-date: 2005-02-02 05:55:39 GMT
Modified-files: libarch/conflict-handling.c
    libarch/conflict-handling.h tests/test-conflicts.sh
New-patches: jblack@gnuarch.org--2004/baz--resolve--1.2--patch-13
Summary: Two related fixes for bug #6081: commit during conflicted state and baz status lying
Keywords: 

